Revert a1f8c63..8027422

This rolls back to commit a1f8c636f1646148908788cfdc1ba0134db065b4.