Revert 3fb7d9b..a3b2cd6

This rolls back to commit 3fb7d9b29a4e847e0b31c3b0e8811b934f379d3a.