Revert 2d063c5..2ab8dd0

This rolls back to commit 2d063c54d8bd9029c607be50bd3176b33ef22560.