Attempt at fixing issue
Revert "Runtime resource overlay, iteration 2"

This reverts commit fd9146665788d06892961252d49aa185f2158767.
Revert back to 4.8 as it seems to cause bootloop on latest commits. Will revisit 4.9 later.