This spec seems unrelated to the rest of the PR