Re-PR of phoron oversight fix

Due to PR delay, this fix got stuck in dev-freeze AFTER dev-freeze got merged into master a while ago. Zuhayr just reminded me of it... fortunately it looks like it was a simple merge to master and fresh PR, no conflicts and no excess file changes.