Updating from https://github.com/mozilla/Ceci/commit/646bbc0b41a3278aa199a0844efc4acd96551760