Commented out offending lines. Replacement for commit 95ecd0ef6553e2107f925c1aa6b0a2d7f864521f, pull request: 236.