Could you try updating to 4.1.0-alpha.1 and remove the code i sent above again? It should now run much faster.