Revert 6910edc..1fdf5ec

This rolls back to commit 6910edc326277642762e588608b366ccc91aa773.