Use proper workaround for stock-id changes.

 * Thanks to Evan Nemerson for the proper solution:
   https://bugzilla.gnome.org/show_bug.cgi?id=695972#c1