Attempt 2 to fix issues building AJDT for e44