We need to remove all of the commented out log statements in this file before we can merge it in.