Add option to re-enable APS in the UI