Summary: Back out D9614432 and partially revert D9623235 to unbreak OSS. Reviewed By: hramos Differential Revision: D9779548 fbshipit-source-id: 931c4987ed5acbae3790c42717662fed77599335