Revert 5c0d93c..cb42537

This rolls back to commit 5c0d93c45b44eac1e93cbda06a8f600349543fe0.