This reverts commit ca59138a2a.
ca59138a2a
I thought these might be useful. Feel free to not accept them, though