Revert 04c43d0..1f146fc

This rolls back to commit 04c43d0a9a85cb5f65cd78239713b21a278f16f7.