Revert non-fix