Revert "speed changes"

This reverts commit 662268fdf80ecc5233dbd73e2b29341b3caf6302.