0.0.0-pre.2: Fix bug where data-loading would never be removed