Revert ebead2d..c2b0863

This rolls back to commit ebead2d607faef397bcd42812555e32c1758ddba.