This dead code should be removed now.