Revert b46282f..db51c36

This rolls back to commit b46282f9454ad7397d133f1606552b2258d4c477.