Revert "I think this change is good..."

This reverts commit b986652c3f9c33d18b7d7e3ccf232e68b6bb782e.