Revert "Breaking the build"

This reverts commit d7764412026f74b667b0f5b733071595b310aa36.