Undoing changes related to local debug/testing

These went by mistake into nexus-2.10.x branch