This reverts commit 9a40a107f8. Reason for revert: Elfin has stricter compiler settings than other platforms and breaks when this is checked in. Change-Id: I169a43ff6b9d90101276690b1d3aae7865946eb0
9a40a107f8