Revert 965e4c0..acdbb68

This rolls back to commit 965e4c09301cd2ca9bf0f3d7ac8f20a25a42d86b.