Bug 835988 - Reverting 9fdf0d138eb0d9f4a2fde56ad9f7e57d4da074f1