Revert "Fix for compilation issues."

This reverts commit 3ffef73a3b8806ea5155d4210d071e64752aa29d.