Revert 5900e1e..9431a62

This rolls back to commit 5900e1e2a6f2e3a2f98ed4483181bf0ff0087059.