20141218

UI
Revert "20141218"

This reverts commit a3c4563cdcbcdf00007c3ec0338757cff6bbf099.