partially revert 94df4199b665c22ec0006a2dc216f8547b4a62c4
* accidently removed dependencies