Revert f234153..b1b4481

This rolls back to commit f234153805194c16819768e1e700109e07dade2d.