#346 - Revert partial improvement, needs additional work