Relevant changes from patch applied to Rolodex.java