Bug 768025 - Modified from the first feedback r=IanN