R4: Fix double-loading from the API for good