Revert 13b640f..70cab88

This rolls back to commit 13b640f93453cc1e36e11b9d9a19727be8f999ff.