Previous revert (r83924) was done in the wrong branch. Reverting the revert.