Improve previous fix, only load from holders if explicitly told to in dev environment