The reversion was done by mistake and inadvertently. Sorry for the mess :-( This reverts commit dcb480334c.
dcb480334c