Revert b04cb4e..eafac83

This rolls back to commit b04cb4e916318c709fa7782e5c7460df2cf8c526.