Replaces commit 44e3708cdb204782d728ddd6a40dec230bb9299c