Debug some more - should be reverted too 2.