Reverts interface change as the old way made more sense