Redo changes from feb79f8769b ...