Revert recent changes to aiming
Fixes #19