Revert "Merge pull request #3142 from Alek2ander/master"

This reverts commit 6f9b58abcebf1e1f8996ed33cafae7bdbf7909a7, reversing
changes made to eda7110a23a971b53112cbf2a3a1cf30f2c78ff3.

Im so sorry aran, so sorry