This reverts commit 7705e49bcd. It broke the bf_asset_system_tests test and this cannot be fixed now so reverting.
7705e49bcd