Refs #3946: change default value and implementation