Revert 811e695..82edd5c

This rolls back to commit 811e6959af2e0f16e7754119c662a8d6c57d2e5a.