Rolls back problematic on-demand loading approach.