Revert 06d188f..519e6cf

This rolls back to commit 06d188fbdd1a0a0b9fd3a5ada4e4e34d18a80439.