Revert "Fixing build issues"

This reverts commit a0b1d3f329c29bcfb21a58e116f75ee09eb93621.