This can be squashed to the next patch. No need for a separatepatch to enable/disable code that only comes in a later patch.