Revert 61b9cc6..cb10a72

This rolls back to commit 61b9cc60986a22bf50fa78705c5cf5b9d2d09cbd.