Patch 12 in this series is optional since it's just me getting the
speed up on a specific machine

/Tomas