Revert c4f44cf9730e45ab6532da7905427e033c5a555d.