scorch no more

Change-Id: I5f2e3e4e8ec182455a8f6243be1742d85575e44b