Merge "Revert "Reduce memory for Barbican kmn nodes""