Revert 0282ac3..587f7a3

This rolls back to commit 0282ac3e34a9f3eae550c56e7d9e71c0475a7352.