keep stock behaviors at the moment

Change-Id: Id2b6a3cdd8e1c644f5f67aea324e475f7f28a7df