Reverted changes to speed version.

This reverts commit 7f9458921b632fc3ef753953d776a32fa4d4c56d.
Changes were applied to src