This reverts commit 45ea380e, reversing
changes made to f9bf35b6.

Feature #23349 was not fully implemented and misses important warning
messages. Considered not ready for relase by Cornel - reverting.