Revert 7eaea4f..2a7df7e

This rolls back to commit 7eaea4f52f83666299afa672976ac66bc786919a.