Revert to earlier method that appears slightly faster.