Revert a6aa223..a95ad88

This rolls back to commit a6aa22356a93f3bdd70b0121afb1877c859fb622.