Revert "Merge remote branch 'acp.language/master'"

This reverts commit 9265d52d1e4030c3928145017ddbc3e221549f98, reversing
changes made to 845907323978d1e5a5d499c4ca1224c8e6529af7.
Revert "Merge remote branch 'acp.style/master'"

This reverts commit 845907323978d1e5a5d499c4ca1224c8e6529af7, reversing
changes made to 61d1f05a01c0bb5c54a366392c5213fcd5ad175e.