Taking out the changes made for testing putposes.

1 job for !589 with e2e-test-aws in 62 minutes and 39 seconds (queued for 3 seconds)
latest merge request