Revert "Merge remote-tracking branch 'origin/master' into AH-247_BumpyBug"

This reverts commit 21b61bea5fa4c3ef591f668a6a0b73a578e06108, reversing
changes made to a04927e99cefafa21a4bc064e98d1200d8a800b6.