Rereverting changes that weren't actually that broken

Always use self