Revert "Merge pull request #26721 from ochameau/customOrigin2"

This reverts commit 2b696f097884262a1dbffe1b031ad7646f8fc8b3, reversing
changes made to 3ce331dc5b362125c1a6e67ed599407b1d1ea658.