Revert 405f64e..3e575a2

This rolls back to commit 405f64e96b53df516ca9570ed40c7e4d239ad5ba.