Revert 7b46130..86f83a8

This rolls back to commit 7b46130d0036d2fe7999b1354616d80947afe94b.