Temporary fix due to neutron upstream split