Revert a88f770..695570e

This rolls back to commit a88f770cf012ffc0e0f52625d2d8cf6576db1b26.