Removed all debug info, effectively rolled back to b6bd3fd