Issue #2319827 follow-up: Removing some redundant info and adding a test