BUILD: Adding back CDH4 as per user requests