undoing unwanted changes. These changes occurred as the result of merging with feature-clickthroughLogging branch