Revert r176120 as it caused a failure at static-member.cpp