Revert "Finish hotfix-1"

This reverts commit 71ddeb97ed0909384cd0682b1d4c925d15a83878, reversing
changes made to 0b802f8eac9043adcc19a1fe2d7843d93542abab.
Finish hotfix-1 (reverted from commit 71ddeb97ed0909384cd0682b1d4c925d15a83878)
Merge branch 'origin/develop'