No more necessary workaround Fixed in CoreBundle