Revert ed30642..824adc9

This rolls back to commit ed30642892c811a9760aa4f251bb9c69aa546284.
3rtyuihjok