Revert 017df5d..7bcc0cd

This rolls back to commit 017df5d46bc5773c1816f9b8ebb6af7124922436.