Revert "Check for an available slave early on"