Revert 76772c7a884 as it doesn't seem to work.
Revert 76772c7a884 as it doesn't seem to work.

eldering/autoanalyst,eldering/autoanalyst,eldering/autoanalyst,eldering/autoanalyst,eldering/autoanalyst,eldering/autoanalyst,eldering/autoanalyst