Reverted fix for #4547: It causes fp. See #4573