Revert "update 2.1.0-RC13 optional"

This reverts commit 3a23b46d1998e65dba7652fa0eba852805afcbea.
2.1.0-RC14