Revert "Merge branch 'develop'"

This reverts commit ef7bc17bdf0f13aca44bbefbe789fcfd6c18c9b1, reversing
changes made to 051aa4596e11af778f382b3bbed4a437b0c9c909.