Revert b692058..7d335e8

This rolls back to commit b692058003ff47eb687436981d7b130015454919.