Remove few @unroll
s that sneaked in with #3404
#3501
Merged
@unroll
s that sneaked in with #3404
#3501