Revert "Merge remote-tracking branch 'refs/remotes/origin/development' into to_master_wotg_development_merge"

This reverts commit 04d830ec21eda848edc9d57cedb5eb7e51fb9cb3, reversing
changes made to b4e4e4746f33bf69a0e84b442c6673c52c2c01f6.