am b2f682bd: Fix Shamus bricked by encryption upgrade

* commit 'b2f682bda8443fb93ab67f19be84fd80d5ed2838':
  Fix Shamus bricked by encryption upgrade