IDEX-706, IDEX-811: Don't use ResourceProvider anymore