Revert d3ef349..8ca6885

This rolls back to commit d3ef3499d7d42af7337201519c9b0367c41a8599.
s