So it turns put this was still needed :P
Also, feels good to be back at this :)

Signed-off-by: Suki <suki@missallsunday.com>
Performance my ass...

Signed-off-by: Suki <suki@missallsunday.com>