refs #6855 reverted branch to working state

with possible conflicts from W_matrix ticket remaining unsolved