No longer necessary after f2ebf911. Also drop two version variables of previously removed dependencies. (cherry picked from commit 1668bcac)