This will likely cause a major version bump, let's not do that right now, because well its not really worth such a bump for just this change. This reverts commit c560e71d91. Change-Id: I3aafa02da91bc39456c705e9f05ec2de625f7e6c
c560e71d91