Revert 6d580a3..bb476b4

This rolls back to commit 6d580a39a70afead2d19a806aa5d2b842df263db.