Revert 9ec956a..7c9efa0

This rolls back to commit 9ec956ad411a9c5546844e67fda5de8b93dbbda7.