Revert a3da7c9..db4f357

This rolls back to commit a3da7c9ef94094acf37deb6e9a911e6c539f4759.