Bug 899434 Review update, removing the use of a deprecated module window-utils