Fix problem with the automattic upgrade