Revert 59558a9..04bffcc

This rolls back to commit 59558a99bcaf95d3513cd548cd1348cb7310d3db.