Revert "2.07.2:zeress:25"

This reverts commit e4d82f543e885c3926c473320bf1f2b956a93972.