Revert "Revert "Revert "Fix for ART build + add default"""

This reverts commit 7b5c15115becdcf394300fa156cd4a8d8b1ac008.