Bug 863511: get rid of the 'expired' state; r=mcote