This reverts commit a22c9f12. The code has not been doing anything for while and it is no longer needed.