Restore more ons

/cc @matthew-andrews I think they got deleted on a merge at some point today.