Revert 316660f..c70e5c8

This rolls back to commit 316660fb12574d434dc4ad6f50fe8be3cc48c245.