Merge "One final attempt at patching over ASEC mess."