This reverts commit 6cdf5fe85f. This version has a crypto regression: https://lkml.org/lkml/2016/2/19/748 which is blocking the channel update due to a failing luksroot test: http://hydra.nixos.org/build/32159615
6cdf5fe85f