See c9ba6d1 and let me know if this was done correctly.