Revert "Merge branch 'Dave'"

This reverts commit 827d48ede2d97e34080d51892090365822f97f3f, reversing
changes made to f2c2bacbb42897ee985c7444d4d4d773aba930e7.