Revert 86ec8af..1a58366

This rolls back to commit 86ec8aff44af361177775ea82496fc3cc37d2231.