Revert "Fix #412"

This reverts commit fce0e40c9c7e447bbca83bdc9892e1ae18760eb1.
Better performance fix for #412

Signed-off-by: Ross Allan <rallanpcl@gmail.com>