Revert ec73028..c4ccd13

This rolls back to commit ec73028f61fea69fea0d820cf8923a75d6711b73.