Revert r214757 (Same fix as r214758)