Revert "New RPM"

This reverts commit 54d7fbb30a663328d9faf3b9425860a45e9fd26b.