TJ/HM: No more builddeps