Killing some extra CPP recompilation in the device infrastructure.