Revert "closes #1430"
Merge pull request #1467 from affektive/revert-1457-1430

Revert "closes #1430"