Replace methods that we actually needed elsewhere. yay tests, facepalm