Revert 89702d3..e82f2ba

This rolls back to commit 89702d314ce366603eb9ec89eba26e11b24b9f8e.