Remove workarounds for componentAvailable() bugs