CE-487 reverting debuging changes