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