Revert "Thanks for nothing eclipse"

This reverts commit a4b34ae4fc9d1e418d03da419342d77f3dacedb2.
Revert "For debug in overnight system tests, add more logging"

This reverts commit 2b65a6ef8c1f9dd59ff5807a8a1fcfe1121fe2da.