Revert a026e04600, undo #236