Merge "Revert "Check the calling user instead of the current user."" into main