you are correct, removing them borks things, sigh.  I will go fill a bug upstream.