Revert ed6e00e..7cd09fd

This rolls back to commit ed6e00e73ffaac2206664bc2c09b8ca551c9212d.