Revert "Revert "Rework CR emulator to support CD20""

This reverts commit fde072fa7d6dca17e3c40eb64e5797e7f6165302.