Reverted debug stuff