revert grable build specific changes