Removed code for 10.4