Revert "#3160 Fixed"

This reverts commit e9f4f120a42c32d5dbe5a12535e369c611d69174.