Revert 2c8a0d8..e87979f

This rolls back to commit 2c8a0d861209b0c864e8aa77eac208f6a5ebd217.