Revert "revert one of the changes"

This reverts commit ed12dd78f0fe68516380a759baf5d2abf9a729bf.