Revert a6f215b..f871b85

This rolls back to commit a6f215b126ff44ec33eb82707feaf48a88c73c4c.