Revert a32df46..94a2450

This rolls back to commit a32df46e109357c9cb89a60e848ee0538a8ede22.