Revert 07cf0e1..7e68af4

This rolls back to commit 07cf0e1a859cbd7ae5c661cb997fd7bb5a761abd.