diff --git a/prepopulate.module b/prepopulate.module
index 9a94b54..560cdae 100644
--- a/prepopulate.module
+++ b/prepopulate.module
@@ -20,10 +20,6 @@ function prepopulate_form_alter(&$form, FormStateInterface $form_state, $form_id
   if (!empty($form_state->rebuild_info)) {
     return;
   }
-  // Provide for accepting base64 encoded fields.
-  if (isset($_REQUEST['pp'])) {
-    parse_str(base64_decode($_REQUEST['pp']), $_REQUEST);
-  }
   if (isset($_REQUEST['edit'])) {
     $form['#after_build'][] = 'prepopulate_after_build';
   }
@@ -33,9 +29,6 @@ function prepopulate_form_alter(&$form, FormStateInterface $form_state, $form_id
  * An #after_build function to set the values prepopulated in the request.
  */
 function prepopulate_after_build($form) {
-  if (isset($_REQUEST['pp'])) {
-    parse_str(base64_decode($_REQUEST['pp']), $_REQUEST);
-  }
   if (isset($_REQUEST['edit'])) {
     $request = (array) $_REQUEST['edit'];
     $prepopulateController = new \Drupal\prepopulate\Controller\prepopulateController();
diff --git a/src/Controller/prepopulateController.php b/src/Controller/prepopulateController.php
index a358162..d0881d6 100644
--- a/src/Controller/prepopulateController.php
+++ b/src/Controller/prepopulateController.php
@@ -25,7 +25,19 @@ class prepopulateController extends ControllerBase {
     *   String or array. Value(s) to be applied to the element.
    */
   function _prepopulate_request_walk(&$form, &$request_slice) {
-    $limited_types = array('value', 'hidden', 'button', 'image_button');
+    $limited_types = array(
+      'actions',
+      'button',
+      'container',
+      'token',
+      'value',
+      'hidden',
+      'image_button',
+      'password',
+      'password_confirm',
+      'text_format',
+      'markup'
+    );
     if (is_array($request_slice)) {
       foreach (array_keys($request_slice) as $request_variable) {
         if (isset($form[$request_variable])) {
