The second will be a longer term fix which should stop spam reaching our infrastructure.
However, historical dynamics are almost impossible to control or suppress in the longer term.