Revert "Merge pull request #1139 from bbodi/devel"

This reverts commit 2da7ad8647afe893b7c6facf6a5c77ff7c5be124, reversing
changes made to 8c6b1b402ea93829596b3add4c71f2d512363484.
Merge pull request #1155 from Varriount/revert-bbodi/devel

Revert "Merge pull request #1139 from bbodi/devel"