Revert 90269c4..2355f55

This rolls back to commit 90269c4e537ac22233a4bdb6c13511d4b3eb28fa.