Revert "Clean up AttributesBuilder class"
Revert "Clean up AttributesBuilder class"

This reverts commit 5fc91bbc8b98626a83613e54542a61a39e9cc7d8.

jgarber623/FrancisCMS,jgarber623/FrancisCMS,FrancisCMS/FrancisCMS,FrancisCMS/FrancisCMS,FrancisCMS/FrancisCMS