Revert 78a5944..251386a

This rolls back to commit 78a5944228f9fbb026a3b4b94e6d285e12d17f36.