Revert 2022da0..dd1e53f

This rolls back to commit 2022da0bbd92f118be1a55a9dc14dd4b060dacb0.