Revert "Code cleanup, refs #2316"

This reverts commit 6e3cfb5fea364d726ab3a44876fc09327cd4d97c.