A tad disturbing pull-request! :D Seemingly quite dramatic change