Defend against partitions at the wrong time causing badness.
Merge in default
Use a new function introduced on default
Also avoid partition-related hangs here.
Merge bug26404