Revert 19d7218..de09482

This rolls back to commit 19d721825bebf87cdcc877b5f4a8d68172841c5d.