Revert 38de1cd..723e69e

This rolls back to commit 38de1cd809ef5e75a87141d47f8efcdbaa533f5c.