Revert a174a7c..4f74d2a

This rolls back to commit a174a7c2790288a11cde68f267c5dfca850f780c.