Commenting code from 3974cb3 which does not compile. Never commit code that does not compile!