Remvoed custom hack (doesn't work anymore)