Revert 1077, merge 1211