Make specs pass on 2-1-stable.