Revert "Fix for ART build + add default"

This reverts commit e9a90e5e081e135dc2ed14b403234b72acef26fe.