Comment 24 for bug 1081843

I opened bug #1267888 to fix the incorrect design issue per Mark's comment.