bug 918055 - address review comments for 3230c9fbf560. r=rail