Tweak to r250117 and change to use ErrorOr and drop isSizeValid for