This reverts commit 78c96dbd. since it removes functionality I like and am used to. Porting should never remove functionality