Revert e490855..9a21e30

This rolls back to commit e490855caa388cddbf30f7586196b2e14ccd91c2.