Revert: Assets workaround