Revert the fix. Look for potential solutions to this puzzle on the
  "fix" branch. The master contains the original puzzle.

This reverts commit 552a4e4b088804f99aa32b625d3d68e14d1017f5.