Revert af828fb..2d1925e

This rolls back to commit af828fbab568b4fc045a05d191845e6f16b4a052.