Revert f1a4ccb..a7cb537

This rolls back to commit f1a4ccb1a1df63b272845d87f2637791c4a41976.