Revert e069c48..c40869f

This rolls back to commit e069c48c370d8890bfb7b3d16e3cdc0deee9a83e.