Reverting 3a217a44b5dd6012f841926b86c06a6c89ac2df8
Reverting 3a217a44b5dd6012f841926b86c06a6c89ac2df8

because e43bd2c fixes it better / faster

atk4/atk4,xepan/atk4,atk4/atk4,svisystem/atk4,xepan/atk4,samratcis/atk4,atk4/atk4,xepan/atk4,atk4/atk4,samratcis/atk4,svisystem/atk4,svisystem/atk4,samratcis/atk4