Revert previous fixes