@mrvisser : Would you be happy with me keeping this here so we know what to revive when removing the custom strategy?