Turns out I'd been doing extra work for years for no reason ...