Revert commits to develop

* commit 921e2bf1cac08de2e3adee37440a386b6d4e94aa.
* commit 0e931528c6bc4e8dec8ad65286495700b456cd63.