SCHEMA-233. Squash this.