revert PR #1030
Merge pull request #1051 from lasconic/revertpr1030

revert PR #1030