Should have been removed by merging master into this branch.

But, something is goofed up causing a pretty nasty merge conflict.
Once we know this is working as expected, master can be overwritten
anyway.