Reverted a903629 and add778c