Reverting 2658a5bf71e2ffdab514b3d562a3547e1d50828c

2658a5bf71e2ffdab514b3d562a3547e1d50828c was evil. Evil.