Revert "For now the acf component will be in a different branch"

This reverts commit e0451d3259a405707d23f3b5207bca78d346f615.