Revert "Dale commiting longchair's changes for testing"

This reverts commit 6dd030a7e39308e8745b4f297cfa1303c5ff5cee.
adding openmax