Revert f35b changes