Revert not more needed code is move to core [z1956]

Signed-off-by: Salja <salja2012@hotmail.de>