Backout patch that was used for logging: d302d3e91fc8
Backout patch that was used for debugging e7f24f93f457
Backout 59efba592bc0, will repush updated patch
Backout cc29b5350708, will repush updated patch
Backout patch used for logging/troubleshooting: 23789dbb3e9b