Revert "R592"

This reverts commit aeda4b03d8605aee251ef98acbc5dd717f896afe.