Revert 64fa198..d9aea1b

This rolls back to commit 64fa1986aaee4e416c4a590fba6f248743a95a62.