Revert 830c01f..8624919

This rolls back to commit 830c01f026d28953d3d6fee33e7644716805e27a.