Revert 610739d..79efabb

This rolls back to commit 610739d5d8a9faf042fad3c74659cf1475bc63cd.