Revert "garbage"

This reverts commit 7be340feba79b6eff794ae36f1b425696e2204d3, reversing
changes made to f7c76313b8e8366f9c690068f7dd16500b7f8e12.
Revert 57ebc3f..6a867bc

This rolls back to commit 57ebc3f9a5a45529881483b62e330fc30f8862d9.