Revert 38b70c2..cc60a33

This rolls back to commit 38b70c2766b00e10966bb288b6f8f9c8d7c6098d.
Revert "Merge branch 'develop'"

This reverts commit 5158c6296cbbbfc54ce1232788c54c0c9f572deb.