Revert aea9b9d..2cadabe

This rolls back to commit aea9b9dd66cb8cd4fc9568e3740b9340dfd88ab8.