This will avoid just getting a black screen when starting up. Dual-core lockup when enabling XFB no-longer seems to happen so this should be safe.
Thanks to FAR - Find And Replace
That took a few hours...