Reverted change, fixed in a fork