Revert f329291..ff08f3a

This rolls back to commit f32929128e1d93517f24253ed58801acc32ce814.