Reviewed by Maciej (a while back).