Revert "Merge branch 'gaving/master' into develop"

This reverts commit 3ae39c6253fec8f305897030ab095f6ef0cc425e, reversing
changes made to 743d264abada42b8f7981485df70ae674d004c12.