Revert 2cfd68e..baa67b4

This rolls back to commit 2cfd68ea473fc7399c3d5035a497bab09751482a,
which was working.