Making the previous commit slightly less abominable
One more abominable API