Work around http://debbugs.gnu.org/18384

Closes #249