baf61b6a02
This reverts commit 551cdcd4cfc1a9bb8b8ebfd315320629baf05655. Reason for revert: breaks windows-psdb Change-Id: I8b2fcaf0d0be09a9364e386127cabafb68a67e0d