Revert my previous patch to ABCD and fix things the right way. There are two problem...