Revert 7aed451..c23f0a5

This rolls back to commit 7aed451d85b1bb1679ec2581e5da6ed3dd55f837.