This reverts commit 738042711b. A second, apparently separate, issue has been reported on the original review.
738042711b