Replaced removed code from commit #01de145305f752d3d5902a83449fde1da7401d2e.