Revert r19843 for now; unreviewed schema changes