Revert "Revert "reverted spec""

This reverts commit 4932e99bdeb7af7f3a9d08aeb2415010255a2afb.