And hopefully finally fix my frankenbug with double-validation.
Merge