Revert "Merge remote-tracking branch 'remotes/origin/dev'"

This reverts commit 3cd42a716da393b35f40fecf05cbf53de5fc8003, reversing
changes made to 792218972827b40267ef9618ebb871b61b5511ea.