It is better to have two exceptions than making these UI files globally
available.

This effectively reverts commit a0f63746

Change-Id: I0f7f1159058be0f5038fbffd7efb5c3a9da3f27c