Undoing commit 4e640be5b38ed90ea7e92e45f513b97fb80a7b7a since it was unsound