Attempt 4 to fix issues building AJDT for e44