Remove temporary fixes in cinder::base

Change-Id: I8c33789183d397cf83743cee165c49d5f0f9ae4d
Fixes: rhbz#958900 for cinder
Merge "Remove temporary fixes in cinder::base" into folsom