I wasn't sure if this was also used for SPICE. I should check if there are no regressions there.