Close #2 at least until M3.