Reverted fix for #5605 since it cause this crash: #5759