This reverts commit 32eda4b92f. I noticed today that environment.d files no longer seem to get sourced by DIB. Reverting this commit fixes it. Change-Id: I08a8feab541901c8fd0a803628f5aeb6c0eec598 Closes-bug: #1339116
32eda4b92f