Disable shelving until it works

Change-Id: Ida17cef7d37a18171e27ea8a14ecb9fd7ddaa017
Merge "Disable shelving until it works"