Revert c3e8517..6aee9e3

This rolls back to commit c3e8517c8f52af661e03e18e5d86db0a3eaeb9aa.