Revert 4696e47..ca842e9

This rolls back to commit 4696e477988e14f3f8e766540c21a9cc2aa3be92.