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

This reverts commit f110d4223fd7fe4e1aa3996d842e61b2e92fa2fe, reversing
changes made to fe44a3b9734fa89fd8f241ddb823a5df2f05539b.