Revert ea519cb..2f55f68

This rolls back to commit ea519cb893ec719e5496ad0335429ab8ea3b3d90.