Revert 09f4316..9299fad

This rolls back to commit 09f4316f77e3744b9b0e308ac4dae91519c37757.