Backed out the alternative emulation changes - not mature enough for primetime yet.