As the AJAX has been replaced with states don't really need this wrapper anymore.