Revert 9985359..b9dda4b

This rolls back to commit 9985359e97c3ea781b733ad016e9160ecbb05a22.