Whoops, restored validation removed in 6ceb9a2