Enabled code that was disabled for tests.