Revert 142cb73..e962b82

This rolls back to commit 142cb739761b2523b9234a05b68d69530a404ef6.