Reverting failed pull request #1036

This reverts commit d6b4ce6c84cc01153cf7a7ebc98bd42106524974, reversing
changes made to a0156961fa56f406339d53d2612b338834f47659.
Merge pull request #1038 from immortius/develop-unmerge

Reverting failed pull request #1036