Actually doing what the previous commit wants