Revert "Improve resampling"

This reverts commit dc25f91b00355b6c92fb3c15a3debedaf3763d82.
Got resampling working better, for several decimations