Revert e595670..78032a8

This rolls back to commit e595670b2050a716f8a4506354ab4c38903b58d3.