Revert b46282f..620fcda

This rolls back to commit b46282f9454ad7397d133f1606552b2258d4c477.