Revert "Merge branch 'dev'"

This reverts commit bf579cbfe8bc9d517c68ff6ca99f5af3501aaf28, reversing
changes made to 7338f9cf764b0fbd7b29dcd3e0f99638b90a3cc3.