removed hacky stuff for 4.2