Revert "Change how Velocity is calculated as mentioned in #478"

This reverts commit 1d5fb05db76a1c8e87c152b2e29c9504b8338277.