Revert 160b075..0a3f01a

This rolls back to commit 160b0756eb2e6a0dcfd16d9c9fefd8f434835525.