following mainline to try and avoid build error