Revert "235643"

This reverts commit 62bf6e8166f8db49e8623097d4290c333491e08b.
Merge branch 'master' into adm