FL-1813: unforking; fixed upstream