Revert cc21495..dd91031

This rolls back to commit cc214956b5e3fdbde3c819c69a57688d1a17dad0.