Revert 1d3b592..6e11433

This rolls back to commit 1d3b592057c38dee51ed45ae44f6b2c1a8baea0c.