This should be reverted.  Same as above...  PSM should correctly define the constant buffers even if there are none.