type deduction fixes
Revert "type deduction fixes"

This reverts commit 9c6b37c1b9baa7e5216b250df61d1055145dbf64.
type deduction fixes