Revert "Merge branch 'dev'"

This reverts commit 9aed7d5b07b4267fd58ab6529ebb5636541a6c8b, reversing
changes made to e3c62d31a201314a576874aaa7b290f9e0ef1e7b.