Revert c1d8ec3..c122978

This rolls back to commit c1d8ec34827504b0af88fc5a2bf1b03db8fdb7fc.