Should we be making the corresponding changes to frontends here, or merge this and clean up in another PR?