Pulled from John
Revert "Pulled from John"

This reverts commit e4289d9a7d518e65ca09852f005b413e91bee1de.
Pulled from John