This needs to move back, the previous behavior was the correct one.