Hopefully, a fix to a transient problem w. immutable.
Authored by: tswift 2015-11-15
Parent: [r8528]
Child: [r8530]