Re-enable debug messages - now same as in sf repo