reverted latest merge from upstream since it somehow broke the compressor