Revert "Merge branch 'dr_staging' into fix2"

This reverts commit d7b80a671fc0c5a7f0492d12846e0df0cb41f126, reversing
changes made to 54f66fbb2c944b21ce33250d479d90f8255e862c.