Reverting the last commit as it had worse amortized cost