Revert "Merge pull request #422 from svanharmelen/f-shaving-off-some-cpu-cycles"

This reverts commit 428cce2478aeb0e091d125e7808aaad42199faf0, reversing
changes made to 517c5b2ea82b22f2275d1522fcf6ea48f1919026.