Work around MRELEASE-812.