Revert "Improve loading time."

This reverts commit 965d723e7d9c2d2e326f82c73b1cd0f7c8d447d8.
Merge branch 'dev'