Actually properly implement my previous commit