Reverted setting the type, it breaks compatibility