Reverting changes so we use pacing again