Switch to more easy-going dependency