Issue #2151657: Use #title_display rather than unsetting #title