Fix QR, again
This is a rollback of 61567970 after fixing a build error due to conflicting definitions of StorageIndex.
Edited by Rasmus Munk Larsen
This is a rollback of 61567970 after fixing a build error due to conflicting definitions of StorageIndex.