Revert "Merge from Master"

Reverts Fox-McCloud/Paradise#44