Bug 898216 - separate strategy selection into a new file