Revert "Merge pull request #697 from mazenovi/master"

This reverts commit 2c68855cc7728664bfb9aa3cd4cbf2097d5d8890, reversing
changes made to d00da50cdd6efecab0473c9655b801d2dc0177cf.