Revert cf2e589..e1cbdd3

This rolls back to commit cf2e589a13ab1109e69a5dc7e2c319961b63cf19.