Revert for now to version with debug messages