Revert 562e920..4e87165

This rolls back to commit 562e920b467e95ae7852d82231c2841fece95acb.