This looks a lot more simple now! Reviewed-by: Rhys Perry <pendingchaos02@gmail.com> Part-of: <!7323>