Revert "Fix broken garbage regression."

This reverts commit ca392d1d398b856720d8eab65062d6d24d45e894.