revert fixes