Revert 9b98922..f3c2d4e

This rolls back to commit 9b9892206a8f248452c79a7ac1993c4ad0466db5.