Revert e801a4a..81e9c5d

This rolls back to commit e801a4ad23d123d49d649e73db6f9b5d4ea9a839.