Revert af409a0..aa47211

This rolls back to commit af409a0e196384111119979b5abb8ea26935fc8f.