AS seems to have miscalculated This reverts commit 344af622b7.
344af622b7
Or so says Android Studio
Closes #3975