golfed version was broken, will fix later

This reverts commit e2c09661c1350d497d531891d400e23192d127f0.