Revert ee153ab..5f8254d

This rolls back to commit ee153abffe6af9827514c833455af9b379df82ac.