Revert dbf6957, 12adc05 and 073a3a4