Reverting 1c300a6f35fa0061edb4ad6fa6c5df0c4f3ed418

Refs #327