dropped -> (back to) -> allow for on-lione

partial rollback 4aa5841bdaa25412cf6b8b6bd236483217e6e29e