Remove some backwards compatibility that will cause problems in an upcoming commit.