Remove the code that I accidently reintroduced when resolving the merge conflict.