Uses the renamed auto tag method

Sorry, this ended up as 2 pull requests.