Revert 9a75876..dc67db0

This rolls back to commit 9a75876c12552b73ad78a46cae66f174b6e33034.