Reverted changes (fixes build)