LPS-27530 Fix Broken Plugins

Hey Brian, your changes broke plugins since ddl-form-portlet is also using this datahandler. Mate reverted your changes in one commit and then applied your new pattern.