Revert 2cff71f..45cadf4

This rolls back to commit 2cff71f217391d3e0271d3d3ae45f7b4183b8691.