Use Jesse's changes from packages.flapjack.io repo