Revert "Merge branch 'dev'"

This reverts commit 8add2360d393d025cf8e44519ffbc02c23724fd6, reversing
changes made to 7a26c333475fe38d0fcfa5a0adc1190836bba533.