Bug 819061 - [Apps] Remove workaround from Bug 813468 once Bug 815523 is done r=ferjm