Commented offending stuff out again.