Issue #507. Reverting automatic blaze-layout...

- Does this fix the problem?