These are also needed by SIF iOS client. This reverts commit 51ab2716da. Signed-off-by: Sean Du <do4suki@gmail.com>
51ab2716da