This is fine but we need to change the way this works in the future Bug 933267