revert part of f069b53