Revert "Merge pull request #21719 from asutherland/cleanup-mancas-bug906580" for Gu failures

This reverts commit 72f75b0886b7aa50b8450adc14a141c4b8fae07a, reversing
changes made to f31f95ec18882decc43c0e2f02df581580a32dc8.