diff --git a/wasp/boards/k9/watch.py.in b/wasp/boards/k9/watch.py.in
index da9d9a2..78dff3c 100644
--- a/wasp/boards/k9/watch.py.in
+++ b/wasp/boards/k9/watch.py.in
@@ -106,16 +106,9 @@ try:
     boot_msg("Init motor")
     vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
 
-    # Release flash from deep power-down
-    boot_msg("Wake SPINOR")
-    nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
-    nor_cs(0)
-    spi.write('\xAB')
-    nor_cs(1)
-
     # Mount the filesystem
     boot_msg("Init SPINOR")
-    flash = FLASH(spi, (nor_cs,))
+    flash = FLASH(spi, (Pin('NOR_CS', Pin.OUT, value=1),))
     try:
         boot_msg("Mount FS")
         os.mount(flash, '/flash')
diff --git a/wasp/boards/p8/watch.py.in b/wasp/boards/p8/watch.py.in
index 1e52ccb..358bfae 100644
--- a/wasp/boards/p8/watch.py.in
+++ b/wasp/boards/p8/watch.py.in
@@ -94,16 +94,9 @@ try:
                     _callback)
     vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
 
-    # Release flash from deep power-down
-    boot_msg("Wake SPINOR")
-    nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
-    nor_cs(0)
-    spi.write('\xAB')
-    nor_cs(1)
-
     # Mount the filesystem
     boot_msg("Init SPINOR")
-    flash = FLASH(spi, (nor_cs,))
+    flash = FLASH(spi, (Pin('NOR_CS', Pin.OUT, value=1),))
     try:
         boot_msg("Mount FS")
         os.mount(flash, '/flash')
diff --git a/wasp/boards/pinetime/watch.py.in b/wasp/boards/pinetime/watch.py.in
index 2e8813f..f156779 100644
--- a/wasp/boards/pinetime/watch.py.in
+++ b/wasp/boards/pinetime/watch.py.in
@@ -96,15 +96,9 @@ try:
                     _callback)
     vibrator = Vibrator(Pin('MOTOR', Pin.OUT, value=0), active_low=True)
 
-    # Release flash from deep power-down
-    boot_msg("Wake SPINOR")
-    nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
-    nor_cs(0)
-    spi.write('\xAB')
-    nor_cs(1)
-
     # Mount the filesystem
     boot_msg("Init SPINOR")
+    nor_cs = Pin('NOR_CS', Pin.OUT, value=1)
     flash = FLASH(spi, (nor_cs,))
     try:
         boot_msg("Mount FS")
diff --git a/wasp/drivers/flash b/wasp/drivers/flash
index 8105da2..bc498ac 160000
--- a/wasp/drivers/flash
+++ b/wasp/drivers/flash
@@ -1 +1 @@
-Subproject commit 8105da265b5c1779a1a4e93392c348f58c149cab
+Subproject commit bc498ac0a8306e32327aa4e66d78c567856f3cf5