removed commented code (cherry picked from commit 420d467)
comments