Revert "Fix #412"This reverts commit fce0e40c9c7e447bbca83bdc9892e1ae18760eb1. (commit: 4082952)
Better performance fix for #412Signed-off-by: Ross Allan <[email protected]> (commit: 5464633)