This may conflict with an updated version of #1829.