Revert b5570d0..3e2ee1a

This rolls back to commit b5570d05fef44c48b5108dedd23aaf196299e889.