Apply d.o patch from 2213283, closes #4.