This reverts commit 9d4a35ba because it appears to break the gradle_non_android_plugin_test.
Attach a file by drag & drop or click to upload
