Revert 3ddf9ad..4c09a8b

This rolls back to commit 3ddf9ad2cd712aa2355701dcbed29fb401a7213d.