Revert pull on the master branch, pulled code is on the develop branch for now

This reverts commit 438f5c5e9e0463f0d8edec0bedb0429fb6387e10.