Reverted changes to make it testable again