Revert 2b9ab03..fdf4602

This rolls back to commit 2b9ab03172fee5725db2ceb317abd26ebb38d5da.