Actually build those Promise changes.  Probably will back out later.