Revert "New public origin"

This reverts commit 4f7daa7d2470b967b55c314024dc4755af782cd5.