Restore #3344 and fix #5612

I'll let someone else do the honors. In particular, there doesn't seem to be a transition strategy in #3344 other than "move yer stuff". Which is cool, but maybe it should be announced.

h/t @lendle for 2/3 of the fix for #5612/#5615.

@kmsquire @StefanKarpinski