Simplify dependency references since Homebrew/homebrew-dupes#359 was merged.

Revert "Force references to the more recently-updated formulas in the homebrew-apache tap"
This reverts commit 55f64f49afac5b178459503a47f6f84269e1d461.