Merge "Remove unnecessary speed feature checking"