Revert 2347c25..3383de0

This rolls back to commit 2347c2519581399d5e11fd74a5895d6abe597136.