reverted change in 658 and simply removed the busted warning for now.