Delete workaround code affected by Bug #1252921