This manual removal was informed by reviews of these commits (newest to oldest): * d930de0b * 114c0f2a * 1c10b097 * 9d4b4dff * da058a29