Revert "1239"

This reverts commit e761c458d173ae6cd2e6dd287c69412c669187a1.