Revert schema change in 1.x, it's 2.x only.

Refs #3891.