Revert 769c1e9..5238d43

This rolls back to commit 769c1e973cdc23fcb33b8b741de7b931b5da8115.