Only use executeOnExecutor for ICS+
Up version to 3.8.5