Revert "Merge From Master"

Reverts Fox-McCloud/Paradise#33