Revert "Improvements to speed feature:"

This reverts commit e9efc9473ca38c240b712a11ba4c035651c204d4.

Remove these changes from this branch