Bug 818287 Add condition to facilitate pre-update marionette.