Nit: please include a reference to the bug number here