revert r18760 since it prevents people from building working eva images