Revert "Bug 6015 : Improving load_testing"