Think the contextlib is not in the right spot

Change-Id: I2bf6f8fbdc1ef063e5ffb80a6abcffdaddd316ae