Revert 2020e76..f5623a8

This rolls back to commit 2020e76e287660522e8f624a621705c56f64d22b.