Merge "Revert "Move quickening info logic to its own table""