Revert 063dc00..d9de705

This rolls back to commit 063dc00caafd59538c64db55e60c1f2b3c843db0.