Adapting to the great /usr/bin migration