Revert "Resolve conflict, add 21."

This reverts commit 2aa505a50213d9ce626cbffbd76a542b0621ea09.