Bug 1090614 follow-up to add back the Clip() change. r=mattwoodrow