Revert 835d1b7..9bbf19f

This rolls back to commit 835d1b77f3014c5b999e0a42f77f0b9a467e14c0.