These will be re-enabled over time as they are updated to work with new
versions of the tools.

REFS: #