Revert "Attempt fixing ART boot loop"

This reverts commit d45fbda10ad547f7678796476e072157646c0275.