Revert 6189ae6..a8d4ec7

This rolls back to commit 6189ae676e2931d34b7572ac1f516cf6bf36eab8.