In T182162 these were removed incorrectly. They should only have been partially removed. Bug: T187222 Change-Id: Ia3fb34250714fe4ccb10c32a7027fda167e06a16