Revert 80d6eba..0f29e75

This rolls back to commit 80d6eba22803fc93e0e5e13d36d0d993d27ffe47.