Reverts 09ae07dca, thus fixing #244.