Revert "REMOVE ORIGINS stuff"

This reverts commit bfd8d2b8ac7493ac8b976e3671981d822b6fda08.