Revert "Fixed declaration issues."

This reverts commit f310062a503a0d5c5e3740ae186834ddad9782b6.