Revert "Merge branch 'develop'"

This reverts commit befc4935189faa4628e5f8d5df2c7dcacb76c319, reversing
changes made to 57158ff007d2cd1918707069b186ad3d667c2077.