Remove code that's commented out since ages
(cherry picked from commit 37bd8f49faa4d284451e47d32bb6a87d221e5229)