Revert "Fixing compile errors."

This reverts commit 8a075ead0afdaeb19648a4aadca5cb16f5770be3.