Revert 90807f9..5af8429

This rolls back to commit 90807f9451585a0cc8cb16967a1f4a1bd7122548.