Revert "Merge with JH & SI"

This reverts commit 7a3a223770df7d5ecdf674903872aa6c8f9650dd.