Revert "This fixes bad commit"

This reverts commit 24e25a8d86380268d14d8cbe609782cfc360092f.
Revert "Merge remote-tracking branch 'upstream/saas-3' into saas-3"

This reverts commit 9e5ddd7d67219e18083cb80d23325a7b01bff384, reversing
changes made to 0aa92fdb03c624e116ad27740c3c73a99fa10792.