am 10d65592: Merge "Make directories always enabled, for realz." into klp-dev

* commit '10d655927c5c10af0561ecc0961f9a9fcbad89f0':
  Make directories always enabled, for realz.