Revert 7d990a7..8a48d5a

This rolls back to commit 7d990a72d2861168d502847faa49e0dafc2678f7.
Merge branch 'master' into develop

* master:
  Revert 7d990a7..8a48d5a