Not sure why my posts seem not to go through (until they all do at once), but at the risk of repeating myself:
I heard from an Adam Gadol who is in position to know that R’ Shmuel understood from R’ Chaim that this is the correct thing to do.
I do not take Shevuos under any circumstances, however.
