Revert "Do additional preparation in a separate method."

This reverts commit e3f568e96c7b496b37008d0da1547db4a2a6eee7.