Revert b2a7421..f06d28d

This rolls back to commit b2a7421637ecb79c2e9a146d1705a7b0da495a1c.