Revert possible jumpiness fixes

Have to find better fix for this...