Revert 4c9a959..2e066fe

This rolls back to commit 4c9a9596a9d721698644092406bf38dafa94826a.