I didn't remove them per se, I just rolled back your b2967145edafc09ecac42eb1dd2ef10000fcb2c8 and then reapplied my patch.