Temporarily reverting this patch due to some unexpected issue found by one of the PPC buildbots. This reverts commit 584e9b6e.