Revert 31f2e9d..2a6c43b

This rolls back to commit 31f2e9d60a086c496021e3101e7d82ce1e4e5863.