Revert 47fc31b..9579244

This rolls back to commit 47fc31b067a9556c4eda8405e6ebc922de917d95.