Revert "Merge branch 'dev'"

This reverts commit b4107c6ba6c2e5095f1a6f1bc1e0d8d4c456834f, reversing
changes made to d44dc00472a1bea89a034eb7ae2006147e5de812.