Revert 3879811..31da343

This rolls back to commit 3879811e1c3297e7ef3df16beb5e97a8e61392ce.