Revert validation removal #214