Reverted some changes due to Dreamhost running 1.8.7