Revert 3df7024..6247577

This rolls back to commit 3df7024d64c62e8c473407cf06c40025f563e5f6.