Causes build problems and does not follow the coding style. This reverts commit 87fe31f87a381761243dcf58e038b058d6c2c604.