Merge pull request #483 from XhmikosR/develop

Revert the unrelated changes from fa5efd7e01751090cb903a25a940c73114cc5489.
WIP