Revert 8667505..80e1280

This rolls back to commit 866750534dc744f33bfc01dd836c2e2aca415ebe.