Revert 2237e79..f1a76b0

This rolls back to commit 2237e79c0b8e761a81039b757b2d79e7e6f0599b.