Revert 1581a81..a286430

This rolls back to commit 1581a81ec6b029fc18cab3b388fb4ef4184c650c.