Revert "Remove Q1D2 and its unit test re #8237"

This reverts commit 54a9275b1a6eb70f9588eb7b3d4196f130e21bb3.