Revert 214b844..13425ec

This rolls back to commit 214b844ef7f26bfb5795c6cdcf8f6782a12be87c.