Messed up last PR, here's a new one.