Revert "Merge branch 'dylan1'"

This reverts commit d87ef568127504ffa54036e0edbc4ce1b8c7e0f5, reversing
changes made to 08d80c1b9323ba8068368642fd0be86baf7d66f1.