Return two accidentally removed member functions

Change-Id: Ideef97c6ddcde9a3c324084a53792c965c7b6707