This is the part that should not be in this PR, since it was added in #1409