Revert 62d87bb..4e80634

This rolls back to commit 62d87bb130139433cb64f0c35d42cc8373d06f56.