Revert "merge dev into branch"

This reverts commit 8712f82234ecc72580c2eb9eb803c76ebdb7e8c0, reversing
changes made to 6264c053029ea7094027c65b38b0cf1aea73cdc3.