Revert "Remove unnecessary constructor"
Revert "Remove unnecessary constructor"

This reverts commit 97f15f7b37b429268f91eecc67c49de2439eacad.

Still broken in Xcode 9.4.1 (which is currently the Travis default).

tmandry/Swindler,tmandry/Swindler,tmandry/Swindler