Revert f17a41a..eb67d7b

This rolls back to commit f17a41a8cb00c370404c616f75655f8994ad8711.