Reverting bad fix for drag issue