The release has happened, the migration worked, all's right with the world. This reverts commit 04eb36588d80dd77a9c692f53470b7d727567604. Change-Id: I28a3e9cf3b420a6ccca20c52c4e67adc3f5710c5