Remove pointless checks that obstruct library usage

Change-Id: I1695b2f64c3aff2688f806c5fc20416fb688bd2f
Merge "Remove pointless checks that obstruct library usage"