Re-add abl-mode (see #1104)