reverted changes to build system