Revert incorrectly removed inner class