Revert 98dab07..0331ec4

This rolls back to commit 98dab07045951049fcf5a538c6a9b9b3beb2a590.