Revert d1a87f7..122904a

This rolls back to commit d1a87f73069be9e472e1f8672172e3957675fe73.