[autotimer] Reversed the commit that threw away all the fixes that have been implemented by Andy over the past year and that now causes ViX-E2 to crash.
It would be very much appriciated if this kind of drastic changes would be made in cooperation with the author of these fixes, instead of just throwing away a lot of work.
(reverse-merged from commit f1ef9156e373bfb36cbb9efa18f00891093161a4)