Revert 29d577f..af76d90

This rolls back to commit 29d577f467562629765fe8088028d972eca979c9.