Hmm, we're past this revision now. Could we remove this code now?