Though I'm on the fence as to whether we should just merge this and make the fix later...