Actually, no, that first one was alright.

This reverts commit eff31c959c6d6a8bab6079630a713e1e0086356c.