...and other code where the plugin wouldn't rewrite automatically

Change-Id: I84cac6398cd100e9830ef7e1944f32a8af048534