The relevant code is included in libhandy 0.8 and can be removed now that we depend on a new enough version.
