Revert "Fixes #1"

This reverts commit fecebdc72d12b58603199b2f02b7c8c93250495f.

Change-Id: I140cce76f0a35fbc2a8858fbfbe9d8c80adea38b