fix merge error
revert 999be4def5a7eaec4d21a2f0ee41aec010ef9383
Merge branch 'master' of https://github.com/NeckbeardedLoser/dcss-detumblrfied