This reverts commit e0fe8cf204. Befor updating we need to fixup problems related to GLVND transition.
e0fe8cf204