Revert e2bca29..4e6f4ef

This rolls back to commit e2bca2957980469c8718c6b8c221475c8cc68c75.