Revert to idempotent/working version but fails on travis