Make changes for review feedbacks and remove `setEnabled()`  API that was added as a hack before.