Reverting a few things that sneaked into b3f0238e0dd9fa by accident