Revert 86f4d01..302cd6e

This rolls back to commit 86f4d015d079c377a56d993d4aefe5473923d31e.