Revert "Merge remote-tracking branch 'origin/sprint-1-Testing' into sprint-1"

This reverts commit 308bbe6aeadd02db699b40e47c61f36f823510e9, reversing
changes made to ba35d4aa1941fb982c9a187de037de8dc0862998.