Merge "Revert "Temporary debugging""