Reverts all commits that broke the MK1 build.

Several features were added that made the MK1 too build to fit on
the PROM.  This change removes those changes so that we get back
to a working MK1.