revert more of f069b53