Revert 5cf8edf..a450852

This rolls back to commit 5cf8edf9ff2ccb86a607ae33512011a9171863e2.
refactored