Revert c48fc82..d2e195d

This rolls back to commit c48fc8228096ca235abaf8aad456ad72ad2e4b99.