back out changes, and comment for debugging