Revert "Small fix"

This reverts commit 335e7eecc71d1ca0c81285616345ab1a2e71260d.
Revert "Mipad Fix 2"

This reverts commit 7d496f55b157bb73fcc23e71d5bd388ebe2fea33.
Revert "Mipad Fix"

This reverts commit 9df08866e7fcaec6cbef8bca74a0cdb5bc0fe971.