Revert f01e282..66163ab

This rolls back to commit f01e282837a812288e7cb00ed575856b865fa468.