EXP-424. Use Robert's version of this change