Reverting pipeline to before the gamma change.
Reverted pipeline while keeping the modified LKT stuff. Also changed
tests so that it works for multiple runs.