Revert e167025..1c8104f

This rolls back to commit e1670257e494dc5f0555d93d2aeff81fdc72d4d0.
Dunno what's this change about...