Revert cb4dbd9..d174003

This rolls back to commit cb4dbd9bc0740df5db6334401ff98140618df11e.