Revert 75429f9..b19d4e6

This rolls back to commit 75429f922e9f404735c850b2d5984dd36928cec1.
Revert 5acb982..dba4338

This rolls back to commit 5acb982d7207db258ffe311df17fc1c80cdba27a.