Revert ab33e85..6649a3f

This rolls back to commit ab33e853fbbd9ac33bf9552a841bda736d44a739.