Revert "Hacking around Code Climate issue."

This reverts commit a4d6b5ff7a40e0bbba097305b97e74968e7dcce2.