Revert 08a64f4..319f1e2

This rolls back to commit 08a64f440df2af4a675f10da526b73d984f07aa5.