Revert f936df7..d8df91d

This rolls back to commit f936df7db1f37248ec6253ee76e78d2e1f04c998.
Revert 0fea13b..b35c759

This rolls back to commit 0fea13b6f11e8679e1b05d0b01c8d0edbd582288.
Revert f936df7..458da72

This rolls back to commit f936df7db1f37248ec6253ee76e78d2e1f04c998.
put the loading change back