Revert f5605ec..9fd8208

This rolls back to commit f5605ec2558778abd7d9c0aa5c9dfbe2b3fba129.