Reverted custom implementation
dist