Revert 64ac2ed..68ec2fb

This rolls back to commit 64ac2eda4a0e8bdfbe5dc9d84b1a918b0cac985b.