Do e still need this with @yorah's 81d1490e1d566af91fc5703fc6fb570fe15d8f83 being merged?