Fix broken specs caused by 496d1ce