This reverts commit 72d85556. AOSP has caught up. Original author has prepared an updated version of this.
Attach a file by drag & drop or click to upload
