Hedge for a fix that @ashort has in the pipeline. Don't merge!
WIP