Revert 7292e10..31b7a8a

This rolls back to commit 7292e10cf7db1be5b6dc3132539823c52911eaa3.
Git error