be828cd3cf
See 7a679eb and previous changes where this behavior was broken (this was
untested, however). Fixes EA-90065
Original commit: 7b2a80ffa4