Revert ac04181..322ac28

This rolls back to commit ac04181878714795e3504bce309f758b15afd275.