Revert b988b47..b7c34b1

This rolls back to commit b988b47788465864883315eb55f9322b3e03603e.