Revert r189902 as the workaround shouldn't be necessary anymore.