revert decltype((e)) change