Revert ca2229f..2c9c66c

This rolls back to commit ca2229f2e275c9c753b6ba4af2d8ab030bfff14e.