Partially revert commit d176647ae8a3601e576ba35e001f8132eaabaff4 - closes #1183

Each feature has a place where it belongs.