Committed a slightly older patch without the proper link to the review. This reverts commit 42874f66.