Revert b988b47..08d9bfc

This rolls back to commit b988b47788465864883315eb55f9322b3e03603e.