Revert 88da922..2ddf980

This rolls back to commit 88da92256b000f7c22c8e6a03b5eeb33ed937a80.
up