Reverted e2e config to recover original (correct) behaviour for e2e tests