Reverting commit 90059ee7a043280223573f409811064e2de8af98 due to
regressions See : MB-12764