Revert "Nightly#0709"

This reverts commit a4bb198e68a4ac7699442ee30bc830ccb481a357.