Revert 6dd2e9a..6f93bc1

This rolls back to commit 6dd2e9a49acde23dcf5e9701915f7e8ed692ce5a.