Revert "Fixes for GCC error on panel"

This reverts commit a2e54df698538673b128e81d979d79d241c2684c.