Revert comment out for debugging