Revert "Merge branch 'David'"

This reverts commit 358a07a98daf71842fcd7bd6501d99b21008adfc, reversing
changes made to bc9e1d3b6ccddeda2fcba77989ef07e3f375ad0b.
Revert "Revert "Merge branch 'David'""

This reverts commit 1f5eec00341a97f86aeda81a52a7b6501a7293c8.