Revert "PIE ON/OFF (2/2)"

This reverts commit 92824a4429dee7cce26c794eb0230f94d2a59206.

Change-Id: If0c31a17a485f678163b8705009a3e61247cfcad