Converted to Vector2fs
Revert "Converted to Vector2fs"

This reverts commit c84ce00adc4ef573ff9be781957d1fb905241000.
Merge remote-tracking branch 'origin/master'