Revert 76bfbf6..63656a2

This rolls back to commit 76bfbf6ee40d977701ac7674ed885e1829025f90.