Revert "Issue #2208783 by mrfelton | lsolesen: Added features override."

This reverts commit 71c6e38fed963cd4dec40588821245e7f29e9558.
Issue #2208783 by dsnopek, mrfelton | lsolesen: Added features override.