Revert 0276c93..6f03d58

This rolls back to commit 0276c93ac0686ba11398f95cd232a45b49da1854.