This seems to collide with gh-4335? So same question...