Revert 3021bee..004681d

This rolls back to commit 3021bee5138c0c76a44a0a81e02e73071869642a.