Revert "Fix volume adjust on rotation"

This reverts commit c2a9b510aa3b29e6600d5dc8f0d447cdcc67ffb2.

Change-Id: I016804a5b6ec17060e8d2a319c34c3a76046f11c