...and while I'm at it, another deprecated fix