Removed overlooked diff line
Disabled (and tweaked) broken code