Revert "Fix the data loading problem"

This bug is fixed in master branch. Remove these temporary fixes.