Revert 96e64ad..3371d1d

This rolls back to commit 96e64ada3b20bf2ddbfdec7adcbeb22e391fc09a.