Attempt to fix Note 2 boot loop

Refs #995