Revert the revert

Revert the commits that originally reverted Ellen's changes, so that we're back in the state where we have her changes.