Reversed pull #1503 to ensure less problems with legacy.