Revert "Merge pull request #26332 from ochameau/customOrigin"

This reverts commit e3ab9dceeb7db02e57c9b44558cc54fb552a297b, reversing
changes made to 1c89a60723ae27e6eb6d3f7aeeca5efbf4c9beb5.