Revert commit 4eb6718f80242cbf323c5e4aff7ecc91d36fdf5e

That last commit in the `fixture-security` branch breaks the installation. Since it's not strictly required I would revert it until we discover the reason why it doesn't work.