Hotfix/2014 06 03 asset perf fix

@dmitchell Here's the PR for the asset performance fix.