Revert fda8ec2..47ff143

This rolls back to commit fda8ec240b6da95df61b1feea58262b73571f1de.