Reinstate all the fixes. Take 3.