Revert db96029..3f7c3bd

This rolls back to commit db96029cd00ea52fe772c1d0dbb26ba24fc54806.