Revert 34d5f82..314fd48

This rolls back to commit 34d5f82edb93c6d0232456caa7280f6ed80e7fdf.