Revert LPS-48386 since it doesn't allow for fast development