Revert PR 649, 656.