Drop the set -e, it is becoming too complicated to ensure it works

Change-Id: I1f2d250807462eace4cf7f7db7a902cc65cfa75a
1 file changed