This reverts commit 51ed4d93df6b795de1b5945a58e6a1f1c6972220. The logging statement made clear the root cause of the bug.