Reverted fix for #119
Clean up