Rolled out some commits made for debugging.