restored 1.2. hardcoding and added a comment from Chris
fix build and 1.6 compatibility