Revert 1edc639..cb655b6

This rolls back to commit 1edc6396a211d4a37def8afebf0db5f93035d338.