Revert dc98dd5..d382a4b

This rolls back to commit dc98dd52cb708e43e9feb4d4f6fd2c8aecfccc18.