Reverted Mantis #4195