Revert 1ce1e73..f7c9413

This rolls back to commit 1ce1e7397478563d5b22992b050e89fb0e3bf190.