This reverts commit 9c0121be. I don't know what this change does and I don't have time to review it at the moment, sorry.