Bug 13899: Add changes as asked in Comment 5