Remove changes from another PR (how did those get in there?)