Revert "Only meant for test branch"

This reverts commit 2b7ca277fd2dcb0e3b00622c900effd39f396d0f.