Revert "First attempt at including availability."

This reverts commit 620bcae537463ce636eca7346386f264843aefa6.