Revert 9243199..7a1fcca

This rolls back to commit 9243199d9b51bb6c6bf25b84b00792cc49a40ad7.