Revert to simpler methods again now we're using instance methods (as before pull request)