Revert "Not for public anymore."

This reverts commit ebc8167984a68752c728284540311e48b4ba7800.