[bug 819167] More removal missing in last commit.