Revert "Merge branch 'reginfo'"

This reverts commit 555b2c9bc95217a6c0e74c4cbbfa4da923291143, reversing
changes made to 7171a069fe3ee98e924e0e05ff1ae779d1de8e18.
2 files changed