Reverted build changes, impossible to merge